xend: reinstate XendOptionsFile.get_external_migration_tool

This was removed by 26167:31dcc0e08754 "xend: Remove old vtpm support
from xm" but at least one caller was left. Reinstate with
s/TPM/device/ since it appears that this functionality could apply
elsewhere.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/tools/python/xen/xend/XendOptions.py b/tools/python/xen/xend/XendOptions.py
index e2651e328e33d02198bb4d587abf78c99cc938dd..cc6f38ed2c898c7afd534e496baa2e8614237029 100644 (file)
--- a/tools/python/xen/xend/XendOptions.py
+++ b/tools/python/xen/xend/XendOptions.py
@@ -349,6 +349,10 @@ class XendOptions:
         else:
             return None
 
+    def get_external_migration_tool(self):
+        """@return the name of the tool to handle virtual device migration."""
+        return self.get_config_string('external-migration-tool', self.external_migration_tool_default)
+
     def get_enable_dump(self):
         return self.get_config_bool('enable-dump', 'no')
 

diff --git a/tools/python/xen/xend/tests/xend-config.sxp b/tools/python/xen/xend/tests/xend-config.sxp
index 9f26e3419bc15ec66e118c27cbb9eb9865fe67ae..8f9ec5b8e0dc19bbae70b91037774f28b76f3a9a 100644 (file)
--- a/tools/python/xen/xend/tests/xend-config.sxp
+++ b/tools/python/xen/xend/tests/xend-config.sxp
@@ -127,3 +127,5 @@
 # Whether to enable core-dumps when domains crash.
 #(enable-dump no)
 
+# The tool used for initiating virtual device migration
+#(external-migration-tool '')